Aidan Hobson Sayers [Sun, 23 Apr 2017 16:08:18 +0000 (17:08 +0100)]
Remove docker flags that can cause issues (rust-lang/rust#39036)
bors [Wed, 19 Apr 2017 02:19:25 +0000 (02:19 +0000)]
Auto merge of #3887 - luser:rustc-wrapper, r=alexcrichton
Add support for wrapping cargo's rustc invocations by setting RUSTC_WRAPPER
To use sccache for cargo builds we need a simple way to get sccache into the rustc commandline when cargo invokes rustc. Currently this is only possible by hard-linking or copying the `sccache` binary to be named `rustc` and then either setting `RUSTC` to its path or putting it first in `$PATH`, both of which are sort of clunky and require manual steps even if installing sccache via `cargo install`.
This patch adds support for a `RUSTC_WRAPPER` environment variable which, if set, will simply be inserted as the actual binary for all rustc process execution, with rustc and all other rustc arguments following.
I didn't add any tests for this, I couldn't figure out the right place to put them, and presumably we'd need to build a helper binary of some sort to use as the wrapper. If you've got suggestions for how to do that properly I'd be happy to write tests.
This works well in my local testing:
```
luser@eye7:/build/read-process-memory$ /build/cargo/target/release/cargo clean; time RUSTC_WRAPPER=/build/sccache2/target/release/sccache RUSTC=/home/luser/.rustup/toolchains/beta-x86_64-unknown-linux-gnu/bin/rustc /build/cargo/target/release/cargo build
Compiling getopts v0.2.14
Compiling log v0.3.6
Compiling libc v0.2.16
Compiling rand v0.3.14
Compiling pulldown-cmark v0.0.3
Compiling tempdir v0.3.5
Compiling skeptic v0.5.0
Compiling read-process-memory v0.1.2-pre (file:///build/read-process-memory)
Finished dev [unoptimized + debuginfo] target(s) in 7.31 secs
real 0m7.733s
user 0m0.060s
sys 0m0.036s
luser@eye7:/build/read-process-memory$ /build/cargo/target/release/cargo clean; time RUSTC_WRAPPER=/build/sccache2/target/release/sccache RUSTC=/home/luser/.rustup/toolchains/beta-x86_64-unknown-linux-gnu/bin/rustc /build/cargo/target/release/cargo build
Compiling getopts v0.2.14
Compiling libc v0.2.16
Compiling log v0.3.6
Compiling pulldown-cmark v0.0.3
Compiling rand v0.3.14
Compiling tempdir v0.3.5
Compiling skeptic v0.5.0
Compiling read-process-memory v0.1.2-pre (file:///build/read-process-memory)
Finished dev [unoptimized + debuginfo] target(s) in 0.97 secs
real 0m1.049s
user 0m0.060s
sys 0m0.036s
```
The use of beta rustc is just to pick up the fix for making `--emit=dep-info` faster (which should ship in 1.17). If this patch ships in cargo then in the future developers should simply be able to `cargo install sccache; export RUSTC_WRAPPER=sccache` and `cargo build` as normal, but benefit from local sccache caching.
bors [Tue, 18 Apr 2017 13:54:28 +0000 (13:54 +0000)]
Auto merge of #3926 - froydnj:reenable-nightly-tests, r=alexcrichton
re-enable previously nightly-only tests
These tests all play nicely with Rust 1.16.
Nathan Froyd [Sat, 15 Apr 2017 01:55:41 +0000 (21:55 -0400)]
re-enable previously nightly-only tests
These tests all play nicely with Rust 1.16.
Ted Mielczarek [Fri, 31 Mar 2017 16:39:19 +0000 (12:39 -0400)]
Add support for wrapping cargo's rustc invocations by setting RUSTC_WRAPPER
bors [Tue, 18 Apr 2017 06:12:37 +0000 (06:12 +0000)]
Auto merge of #3928 - andwur:version-not-found-error-msgs, r=alexcrichton
Better error message when a package version is not found
This changes the error message when a package *is* found but there's no
matching version to be a little more helpful.
Old: "no matching package named `<dep name>`"
New: "no matching version `<version>` found for package `<dep name>`"
Fixes #2997
bors [Tue, 18 Apr 2017 04:26:49 +0000 (04:26 +0000)]
Auto merge of #3924 - koivunej:issue_3922, r=alexcrichton
Adjust submodule updating failure reporting
This PR changes output of cargo when updating a dependency fails because of it's submodules cannot be loaded. In my original example this was caused by submodule pointing to a revision which was deleted by force pushing. Fixes #3922.
Before:
```
$ cargo check
Updating git repository `<foo-url>`
error: failed to load source for a dependency on `foo`
Caused by:
Unable to update <foo-url>?rev=hash
To learn more, run the command again with --verbose.
```
After:
```
$ cargo check
Updating git repository `<foo-url>`
error: failed to load source for a dependency on `foo`
Caused by:
Unable to update <foo-url>?rev=hash
Caused by:
Failed to update submodule `submodule`
To learn more, run the command again with --verbose.
```
`--verbose` showing an additional `[9/-3] object not found - no match for id (hash)` has not been changed.
@alexcrichton since we have this nice timezone difference there was no chance of mentoring so far but any comments/suggestions are highly welcome. I'll likely check back on this next week.
bors [Tue, 18 Apr 2017 02:52:17 +0000 (02:52 +0000)]
Auto merge of #3908 - froydnj:overflow-checks, r=alexcrichton
add `overflow-checks` field to profiles
...and pass `-C overflow-checks` to the compiler when necessary.
Fixes #2262.
bors [Tue, 18 Apr 2017 01:16:05 +0000 (01:16 +0000)]
Auto merge of #3930 - alexcrichton:more-clean, r=alexcrichton
Clean some more env vars during tests
Will be required to run tests as part of rust-lang/rust
Alex Crichton [Tue, 18 Apr 2017 00:55:59 +0000 (17:55 -0700)]
Clean some more env vars during tests
Will be required to run tests as part of rust-lang/rust
Andrew Watts [Mon, 17 Apr 2017 12:24:56 +0000 (21:54 +0930)]
Fix #2997: error message when version not found could be improved
This changes the error message when a package *is* found but there's no
matching version to be a little more helpful.
Old: "no matching package named `...`"
New: "no matching version `...` found for package `...`"
Joonas Koivunen [Mon, 17 Apr 2017 12:08:51 +0000 (15:08 +0300)]
git: use lower case in error message
Nathan Froyd [Fri, 7 Apr 2017 16:32:42 +0000 (12:32 -0400)]
add `overflow-checks` field to profiles
...and pass `-C overflow-checks` to the compiler when necessary.
Fixes #2262.
Joonas Koivunen [Fri, 14 Apr 2017 07:55:26 +0000 (10:55 +0300)]
style fixes
Joonas Koivunen [Fri, 14 Apr 2017 05:38:55 +0000 (08:38 +0300)]
git: adjust error on submodule update failure
Now instead of reporting single generic "submodule update failed" a
dependency specific submodule update failed error message will be
reported and shown without --verbose.
Joonas Koivunen [Fri, 14 Apr 2017 05:38:36 +0000 (08:38 +0300)]
git: refactor update_submodule out of loop
Joonas Koivunen [Fri, 14 Apr 2017 03:58:02 +0000 (06:58 +0300)]
reproduce error msg in test case
bors [Wed, 12 Apr 2017 22:28:57 +0000 (22:28 +0000)]
Auto merge of #3919 - malbarbo:openssl-probe, r=alexcrichton
Update openssl-probe to 0.1.1
This helps find ssl certificates on termux (android).
bors [Wed, 12 Apr 2017 20:24:43 +0000 (20:24 +0000)]
Auto merge of #3885 - malbarbo:android-build, r=alexcrichton
Add android build support
This add android build support, including openssl.
Marco A L Barbosa [Wed, 12 Apr 2017 19:49:53 +0000 (16:49 -0300)]
Update openssl-probe to 0.1.1
bors [Wed, 12 Apr 2017 19:03:16 +0000 (19:03 +0000)]
Auto merge of #3847 - SergioBenitez:master, r=alexcrichton
Always emit build script warnings for crates that fail to build
Resolves #3777.
r? @alexcrichton
Marco A L Barbosa [Tue, 11 Apr 2017 20:26:22 +0000 (17:26 -0300)]
Remove android build for aarch64, arm and i686
Marco A L Barbosa [Thu, 30 Mar 2017 23:15:48 +0000 (20:15 -0300)]
Add android build to travis
Marco A L Barbosa [Thu, 30 Mar 2017 23:08:54 +0000 (20:08 -0300)]
Add android Dockerfile
Marco A L Barbosa [Thu, 30 Mar 2017 23:06:54 +0000 (20:06 -0300)]
Add openssl build support for android
bors [Mon, 10 Apr 2017 20:40:50 +0000 (20:40 +0000)]
Auto merge of #3914 - jwilm:specifying-dependencies-replace-note, r=alexcrichton
Add note about Cargo.lock behavior with [replace]
The Cargo.lock behavior when using [replace] can be misleading if one
does not expect multiple versions of the crate to be included. This note
is intended to assure users that this behavior is expected, and it
suggests a way to verify their `[replace]` override is preferred.
I ran into this issue and ended up bugging @alexcrichton about it. Hopefully including this will reduce the support burden on cargo devs :smile:.
Joe Wilm [Mon, 10 Apr 2017 20:24:31 +0000 (13:24 -0700)]
Add note about Cargo.lock behavior with [replace]
The Cargo.lock behavior when using [replace] can be misleading if one
does not expect multiple versions of the crate to be included. This note
is intended to assure users that this behavior is expected, and it
suggests a way to verify their `[replace]` override is preferred.
bors [Mon, 10 Apr 2017 14:42:41 +0000 (14:42 +0000)]
Auto merge of #3909 - JanLikar:fix/3876, r=alexcrichton
Improve "dirty" error message
Improve the error message stating the working directory has dirty files (files not yet committed).
Fix #3876.
Jan Likar [Sun, 9 Apr 2017 02:20:41 +0000 (04:20 +0200)]
Improve "dirty" error message
Improve the error message stating the working directory has dirty
files (files not yet committed).
Fix #3876.
Sergio Benitez [Sun, 19 Mar 2017 02:33:09 +0000 (19:33 -0700)]
Always emit build script warnings for crates that fail to build
Resolves #3777
bors [Sat, 8 Apr 2017 23:07:02 +0000 (23:07 +0000)]
Auto merge of #3907 - waywardmonkeys:show-default-new, r=alexcrichton
Indicate that --lib is default for new, init.
I often forget for a moment which is the default behavior: `--bin` or `--lib`. This makes it clear in the usage text.
bors [Sat, 8 Apr 2017 21:29:11 +0000 (21:29 +0000)]
Auto merge of #3904 - tee-too:fix-3880, r=alexcrichton
Sort tests so that unit tests are run before integration tests
Fix #3880
bors [Sat, 8 Apr 2017 19:53:03 +0000 (19:53 +0000)]
Auto merge of #3906 - waywardmonkeys:typo-fixes, r=alexcrichton
Fix typos.
Bruce Mitchener [Fri, 7 Apr 2017 09:37:34 +0000 (16:37 +0700)]
Indicate that --lib is default for new, init.
Bruce Mitchener [Fri, 7 Apr 2017 09:32:11 +0000 (16:32 +0700)]
Fix typos.
tee-too [Thu, 6 Apr 2017 14:18:07 +0000 (16:18 +0200)]
Sort tests so that unit tests are run before integration tests
Fix #3880
bors [Wed, 5 Apr 2017 23:36:04 +0000 (23:36 +0000)]
Auto merge of #3898 - jmatraszek:fix_rust_40955, r=alexcrichton
Fix rust-lang/rust 40955
Proposed fix for rust-lang/rust#40955.
I could also work on adding some additional tests, so we have all cases covered and automatically tested.
Alex Crichton [Wed, 5 Apr 2017 23:35:39 +0000 (16:35 -0700)]
Touch up line lengths
Jakub Matraszek [Tue, 4 Apr 2017 21:58:31 +0000 (23:58 +0200)]
Fix rust 40955
bors [Tue, 4 Apr 2017 18:01:01 +0000 (18:01 +0000)]
Auto merge of #3854 - tee-too:fix-3499, r=alexcrichton
Add `[target.'cfg(...)']` syntax for rustc(doc)flags in .cargo/config
Allow to use the Rust `cfg(...)` syntax to configure rust(doc)flags.
The flags are concatenated when a build matches several `cfg`, or
several `cfg` and a $triple.
Fix #3499.
tee-too [Mon, 3 Apr 2017 18:35:23 +0000 (20:35 +0200)]
Add `[target.'cfg(...)']` syntax for rustc(doc)flags in .cargo/config
Allow to use the Rust `cfg(...)` syntax to configure rust(doc)flags.
The flags are concatenated when a build matches several `cfg`, or
several `cfg` and a $triple.
Fix #3499.
bors [Mon, 3 Apr 2017 22:30:12 +0000 (22:30 +0000)]
Auto merge of #3893 - nrc:config-values, r=alexcrichton
Allow a client to override values in a config
The use case here is that the RLS wants to set a project's `target-dir`, but can't do this using a config file (since the user might have their own, and it's a bit hacky) or via an environment variable (because there might be multiple instances of Cargo running on different directories in different threads.
ISTM that the best way to accomplish this is to allow the RLS to override values in the config before we make a workspace from it. However, since the config uses a `LazyCell` for the config values, this is not very nice (if something tries to read a config value before we set them, then there will be an error when we try to set them). However, this meets our needs and is pretty low impact, so it seems like the best solution for now. I'm open to other ideas though.
Nick Cameron [Mon, 3 Apr 2017 02:08:15 +0000 (14:08 +1200)]
Allow a client to override values in a config
bors [Sat, 1 Apr 2017 06:32:23 +0000 (06:32 +0000)]
Auto merge of #3842 - pwoolcoc:add-pijul-vcs-support, r=alexcrichton
Add Pijul support to Cargo
[Pijul](https://pijul.org) is a version control system written in Rust. This commit adds the ability to create a cargo project using pijul as the vcs for the project.
To use it, run `cargo new my-awesome-project --vcs=pijul`
bors [Sat, 1 Apr 2017 01:48:01 +0000 (01:48 +0000)]
Auto merge of #3889 - alexcrichton:toml-fix, r=alexcrichton
Update toml to fix a regression in backcompat
Related to rust-lang/rust#40956
Alex Crichton [Sat, 1 Apr 2017 01:45:55 +0000 (18:45 -0700)]
Update toml to fix a regression in backcompat
Related to rust-lang/rust#40956
Paul Woolcock [Fri, 31 Mar 2017 15:35:58 +0000 (11:35 -0400)]
Add Pijul support to cargo
[Pijul](https://pijul.org) is a version control system written in Rust. This commit adds the ability to create a cargo project using pijul as the vcs for the project.
To use it, run `cargo new my-awesome-project --vcs=pijul`
bors [Fri, 31 Mar 2017 15:50:19 +0000 (15:50 +0000)]
Auto merge of #3878 - ehiggs:revert-template-until-after-rfc, r=alexcrichton
Revert template until after rfc
As discussed in #3860, templates was merged without going through the RFC process. @ssokolow has raised some useful comments which need to be settled before the template system can be put back in.
#3859 was another relevant issue.
bors [Thu, 30 Mar 2017 18:10:07 +0000 (18:10 +0000)]
Auto merge of #3875 - matklad:unused-replace, r=alexcrichton
Fix false positive about unused replace
closes #3861
@chriscoomber thanks for the great repro!
bors [Thu, 30 Mar 2017 15:25:03 +0000 (15:25 +0000)]
Auto merge of #3879 - jbendig:issue_3867, r=alexcrichton
Fix `cargo run` panic when required-features not satisfied
This PR fixes #3867 which is made up of two parts.
The first part involves `cargo run` triggering an assertion after compiling. This is triggered by the single binary selected for compilation being filtered out when required-features is specified and said features are not enabled. The cleanest approach to me involves just sticking a flag into `CompileFilter::Everything`. The flag then triggers the already existing error message when required-features is not satisfied. I think this works best because it localizes what is really a `cargo run` quirk without requiring any boilerplate or duplicate code.
The second part shows `cargo run` bailing when two binaries exist, both with required-features, but only one is resolved to be compiled due to default features. I feel like the current approach is correct because it's consistent with what normally happens when there are multiple binaries. I'm open to changing this, but for now, I've added a test to enforce this behavior.
cc @BenWiederhake: I took a quick peek at your branch to fix #3112 and I noticed that it probably won't merge cleanly with this PR. Just an FYI in case it makes sense to have this merged.
James Bendig [Wed, 29 Mar 2017 20:48:43 +0000 (15:48 -0500)]
Fix `cargo run` panic when required-features not satisfied
Fixes #3867
Ewan Higgs [Wed, 29 Mar 2017 20:23:46 +0000 (22:23 +0200)]
Cleanup of template patch reversion.
Ewan Higgs [Wed, 29 Mar 2017 19:57:33 +0000 (21:57 +0200)]
Revert "Cargo templating for `new` and `init`"
This reverts commit
875a8aba7916b63c3c8464008a271f6082e23779.
Ewan Higgs [Wed, 29 Mar 2017 19:54:39 +0000 (21:54 +0200)]
Revert "Upgrade handlebars to 0.25."
This reverts commit
0aad658f09590396b4c7fe6ce93eae322354fd06.
Ewan Higgs [Wed, 29 Mar 2017 19:52:23 +0000 (21:52 +0200)]
Revert "Fix for #3722"
This reverts commit
7e80c684cad3249923b05ecbe02c009b111d9b9f.
Ewan Higgs [Wed, 29 Mar 2017 19:51:50 +0000 (21:51 +0200)]
Revert "Use time crate directly to get the year"
This reverts commit
47221e98189daa34e47934d44223db12db84c7b9.
Ewan Higgs [Wed, 29 Mar 2017 19:50:53 +0000 (21:50 +0200)]
Revert "Add year to project template variables"
This reverts commit
69ffd99f4261b10414b882eed638f041e42d8f73.
Aleksey Kladov [Wed, 29 Mar 2017 09:58:45 +0000 (12:58 +0300)]
Fix false positive about unused replace
bors [Mon, 27 Mar 2017 13:51:57 +0000 (13:51 +0000)]
Auto merge of #3869 - matklad:test-isolation, r=alexcrichton
Don't read ~/.cargo/config in tests
Closes #3863
r? @alexcrichton
Aleksey Kladov [Sat, 25 Mar 2017 11:17:51 +0000 (14:17 +0300)]
Don't read ~/.cargo/config in tests
Closes #3863
bors [Sat, 25 Mar 2017 02:22:06 +0000 (02:22 +0000)]
Auto merge of #3865 - matklad:doc-all-the-things, r=alexcrichton
Beef up docs about integrating Cargo with other stuff
Add info about `--message-format=json`, `--dep-info` and custom cargo subcommands (mostly copy-pasted from the wiki :) ).
cc @carols10cents
r? @alexcrichton
Aleksey Kladov [Fri, 24 Mar 2017 22:46:36 +0000 (01:46 +0300)]
Add external-tools.md to the Makefile
bors [Fri, 24 Mar 2017 15:04:47 +0000 (15:04 +0000)]
Auto merge of #3862 - matklad:crate-types, r=alexcrichton
Fix crate_types in serialized targets
closes #3840
Aleksey Kladov [Fri, 24 Mar 2017 09:11:43 +0000 (12:11 +0300)]
Beef up docs about integrating Cargo with other stuff
Aleksey Kladov [Fri, 24 Mar 2017 07:40:12 +0000 (10:40 +0300)]
Fix crate_types in serialized targets
bors [Thu, 23 Mar 2017 23:26:55 +0000 (23:26 +0000)]
Auto merge of #3857 - antonlarin:rebuild-on-env-change, r=alexcrichton
Include package props with corresponding env vars into target metadata
Previously, when changing package properties with corresponding environment variables (such as authors, which has CARGO_PKG_AUTHORS), it didn't invalidate the build, even though there could have been a dependency on such variables in the source code.
This commit includes 3 such properties: authors list, description and homepage in the target metadata.
I've added a test only for description change, can add more if necessary.
Fixes #3696.
bors [Thu, 23 Mar 2017 21:56:53 +0000 (21:56 +0000)]
Auto merge of #3837 - alexcrichton:workspace-exlucde, r=brson
Add a workspace.exclude key
This commit adds a new key to the `Cargo.toml` manifest, `workspace.exclude`.
This new key is a list of strings which is an array of directories that are
excluded from the workspace explicitly. This is intended for use cases such as
vendoring where path dependencies into a vendored directory don't want to pull
in the workspace dependencies.
There's a number of use cases mentioned on #3192 which I believe should all be
covered with this strategy. At a bare minimum it should suffice to `exclude`
every directory and then just explicitly whitelist crates through `members`
through inclusion, and that should give precise control over the structure of a
workspace.
Closes #3192
Anton Larin [Thu, 23 Mar 2017 14:26:40 +0000 (17:26 +0300)]
Include package props with env vars into target metadata
Previously, when changing package properties with corresponding
environment variables (such as authors, which has CARGO_PKG_AUTHORS),
it didn't invalidate the build, even though there could have been
a dependency on such variables in the source code.
This commit includes such properties (there are 3 of them in total:
authors, description and homepage) in the target metadata.
Fixes #3696.
bors [Thu, 23 Mar 2017 15:28:45 +0000 (15:28 +0000)]
Auto merge of #3858 - alexcrichton:fix-ci, r=alexcrichton
Attempt to fix CI
Travis looks to have switched to rustup.rs
Alex Crichton [Thu, 23 Mar 2017 15:10:58 +0000 (08:10 -0700)]
Attempt to fix CI
Travis looks to have switched to rustup.rs
bors [Tue, 21 Mar 2017 13:50:59 +0000 (13:50 +0000)]
Auto merge of #3841 - matklad:encourage-explicit-version, r=alexcrichton
Encourage tools writers to explicitly pin metadata version
We do support versioning of metadata, but let's encourage tool's writers to actually use it.
They might not realize that this flag exists at all, or they can be too lazy (like myself :( ) to use it.
We can also make this flag mandatory, but I think that's a little bit to far.
bors [Mon, 20 Mar 2017 22:10:08 +0000 (22:10 +0000)]
Auto merge of #3848 - tee-too:fix-2529, r=alexcrichton
Report the name of the test that failed (fix #2529)
Fix #2529
bors [Mon, 20 Mar 2017 20:39:33 +0000 (20:39 +0000)]
Auto merge of #3849 - alexcrichton:fix-stack-overflow, r=matklad
Detect cyclic dependencies through [replace]
Previously this'd cause a stack overflow in Cargo later in the compilation
graph, but this is intended to get caught during resolution.
Closes #3831
Alex Crichton [Mon, 20 Mar 2017 19:43:44 +0000 (12:43 -0700)]
Detect cyclic dependencies through [replace]
Previously this'd cause a stack overflow in Cargo later in the compilation
graph, but this is intended to get caught during resolution.
Closes #3831
tee-too [Mon, 20 Mar 2017 10:39:22 +0000 (11:39 +0100)]
Report the name of the test that failed (fix #2529)
bors [Sat, 18 Mar 2017 13:01:54 +0000 (13:01 +0000)]
Auto merge of #3843 - alexcrichton:fix-override-default-features, r=matklad
Fix overriding mixing with default features
Previously Cargo had a bug where if a crate *without* a default feature was
overridden with one that did indeed have a default feature then the default may
not end up getting activated by accident. The fix was to avoid returning too
quickly hen activating dependencies until after we've inspected and learned
about replacements.
Closes #3812
Alex Crichton [Fri, 17 Mar 2017 23:12:11 +0000 (16:12 -0700)]
Fix overriding mixing with default features
Previously Cargo had a bug where if a crate *without* a default feature was
overridden with one that did indeed have a default feature then the default may
not end up getting activated by accident. The fix was to avoid returning too
quickly hen activating dependencies until after we've inspected and learned
about replacements.
Closes #3812
Aleksey Kladov [Fri, 17 Mar 2017 15:00:29 +0000 (18:00 +0300)]
Encourage tools writers to explicitly pin metadata version
bors [Fri, 17 Mar 2017 14:02:19 +0000 (14:02 +0000)]
Auto merge of #3839 - tee-too:fix-3828, r=matklad
Remove --cap-lints feature detection (fix issue #3828)
tee-too [Fri, 17 Mar 2017 13:52:31 +0000 (14:52 +0100)]
Remove --cap-lints feature detection (fix issue #3828)
Alex Crichton [Thu, 16 Mar 2017 21:50:23 +0000 (14:50 -0700)]
Add a workspace.exclude key
This commit adds a new key to the `Cargo.toml` manifest, `workspace.exclude`.
This new key is a list of strings which is an array of directories that are
excluded from the workspace explicitly. This is intended for use cases such as
vendoring where path dependencies into a vendored directory don't want to pull
in the workspace dependencies.
There's a number of use cases mentioned on #3192 which I believe should all be
covered with this strategy. At a bare minimum it should suffice to `exclude`
every directory and then just explicitly whitelist crates through `members`
through inclusion, and that should give precise control over the structure of a
workspace.
Closes #3192
bors [Thu, 16 Mar 2017 21:03:56 +0000 (21:03 +0000)]
Auto merge of #3836 - alexcrichton:bump, r=alexcrichton
Bump to 0.19.0
Alex Crichton [Thu, 16 Mar 2017 21:03:30 +0000 (14:03 -0700)]
Bump to 0.19.0
bors [Mon, 13 Mar 2017 22:21:16 +0000 (22:21 +0000)]
Auto merge of #3827 - alexcrichton:warnings-v2, r=matklad
Cap lints for upstream deps with `-vv`
Previously with `-vv` Cargo didn't pass `--cap-lints` at all, but with upstream
dependencies we still want to pass at least `--cap-lints warn` to make sure that
they're all still compiling.
Closes #3823
Alex Crichton [Mon, 13 Mar 2017 17:15:36 +0000 (10:15 -0700)]
Cap lints for upstream deps with `-vv`
Previously with `-vv` Cargo didn't pass `--cap-lints` at all, but with upstream
dependencies we still want to pass at least `--cap-lints warn` to make sure that
they're all still compiling.
Closes #3823
bors [Sun, 12 Mar 2017 15:54:19 +0000 (15:54 +0000)]
Auto merge of #3818 - jmatraszek:3814-run_proper_binary_main_rs, r=alexcrichton
Fixes #3814
bors [Sun, 12 Mar 2017 07:07:34 +0000 (07:07 +0000)]
Auto merge of #3820 - alexcrichton:remove-build-date, r=alexcrichton
Remove build date from version
This was done by rustc awhile ago anyway and the rustc build system isn't
exporting it.
Alex Crichton [Sun, 12 Mar 2017 02:17:07 +0000 (18:17 -0800)]
Tweak travis targets and dates
Just trying to get a PR to land...
Alex Crichton [Sun, 12 Mar 2017 02:09:28 +0000 (18:09 -0800)]
Remove build date from version
This was done by rustc awhile ago anyway and the rustc build system isn't
exporting it.
Jakub Matraszek [Sat, 11 Mar 2017 09:36:14 +0000 (10:36 +0100)]
#3814: Fallback to src/bin/main.rs for bins
bors [Thu, 9 Mar 2017 15:17:08 +0000 (15:17 +0000)]
Auto merge of #3807 - nerdrew:nerdrew/_cargo, r=alexcrichton
support custom cargo-* command zsh tab completion
bors [Wed, 8 Mar 2017 19:21:14 +0000 (19:21 +0000)]
Auto merge of #3794 - alexcrichton:better-errors, r=matklad
Improve TOML decoding error messages
Unfortunately while `#[serde(untagged)]` is precisely what we want in terms of
semantics it leaves a little to be desired in terms of error messages. This
commit updates to remove the usage of that attribute in favor of implementing
`Deserialize` directly, which is quite simple in these few cases.
Closes #3790
Alex Crichton [Fri, 3 Mar 2017 16:12:12 +0000 (08:12 -0800)]
Improve TOML decoding error messages
Unfortunately while `#[serde(untagged)]` is precisely what we want in terms of
semantics it leaves a little to be desired in terms of error messages. This
commit updates to remove the usage of that attribute in favor of implementing
`Deserialize` directly, which is quite simple in these few cases.
Closes #3790
Andrew Lazarus [Wed, 8 Mar 2017 17:23:36 +0000 (09:23 -0800)]
support custom cargo-* command zsh tab completion
bors [Wed, 8 Mar 2017 00:00:34 +0000 (00:00 +0000)]
Auto merge of #3789 - vojtechkral:cargo_env, r=alexcrichton
Tell subprocesses the path to self in an env variable #3778
I'm just setting the env var on the process itself, letting subprocesses inherit that, as it's easier than setting for each subprocess individually. I'm not entirely sure this is the right spot though.
Also, I should probably document this somewhere - what would be the best place?
Vojtech Kral [Thu, 2 Mar 2017 06:38:54 +0000 (07:38 +0100)]
Tell subprocesses the path to self in an env variable #3778
bors [Tue, 7 Mar 2017 15:24:52 +0000 (15:24 +0000)]
Auto merge of #3369 - joshtriplett:cargo-install-only-required-dependencies, r=alexcrichton
cargo fails if it can't find optional dependencies, even if corresponding feature not enabled
I have a directory registry containing all the crate sources needed to build an application crate (for instance, ripgrep), and a `$CARGO_HOME/config` file that looks like this:
```toml
[source.crates-io]
replace-with = "dh-cargo-registry"
[source.dh-cargo-registry]
directory = "/usr/share/cargo/registry/"
```
When I attempt to build ripgrep via "cargo install ripgrep" from that directory registry, I get this error:
```
error: failed to compile `ripgrep v0.3.1`, intermediate artifacts can be found at `/tmp/cargo-install.rmKApOw9BwAL`
Caused by:
no matching package named `simd` found (required by `bytecount`)
location searched: registry https://github.com/rust-lang/crates.io-index
version required: ^0.1.1
```
The directory registry indeed does not contain "simd"; however, bytecount doesn't require simd. It has an optional dependency on simd, and nothing enables the feature that requires that dependency.
Placing the simd crate sources into the directory registry allows ripgrep to build; the resulting build does not actually build the simd crate.
I can reproduce this by just trying to build the "bytecount" crate directly, using the same `$CARGO_HOME`:
```
error: no matching package named `simd` found (required by `bytecount`)
location searched: registry https://github.com/rust-lang/crates.io-index
version required: = 0.1.1
```
(Incidentally, that "version required" seems wrong: bytecount has an optional dependency on simd `^0.1.1`, not `=0.1.1`.)
However, this doesn't seem consistent with other crates in the same dependency tree. For instance, ripgrep also depends on clap, and clap has an optional dependency on yaml-rust, yet cargo does not complain about the missing yaml-rust.
I'd *guess* that the difference occurs because ripgrep has an optional feature `simd-accel` that depends on `bytecount/simd-accel`, so cargo wants to compute what packages it needs for that case too, even when building without that feature. (Similar to #3233.)
However, this makes it impossible to build a package while installing only the packaged dependencies for the enabled features. Could `cargo install` ignore any dependencies not actually required by the enabled feature? (That behavior would make no sense for "cargo build", which builds a Cargo.lock file that should remain consistent regardless of enabled features, but it makes sense for "cargo install cratename", which doesn't build a Cargo.lock file.)
bors [Mon, 6 Mar 2017 20:42:29 +0000 (20:42 +0000)]
Auto merge of #3795 - jryans:template-year, r=alexcrichton
Add year to project template variables
This adds the current year as a `year` variable for project templates. Some license files / headers include the year, so this should make it easier to include those in a template.
Josh Triplett [Thu, 2 Mar 2017 02:19:43 +0000 (18:19 -0800)]
In "cargo install" directly from registry, don't require optional dependencies
When building with a directory registry that contains only the subset of
crates required to build an application crate, cargo fails if that
subset doesn't include optional dependencies pulled in for every
possible feature of the root crate, even when the install doesn't enable
those features. This prevents Linux distributions from building with
a minimal set of dependencies (omitting, for instance, packages for
unstable/nightly features).
Introduce a new workspace flag "require_optional_deps", disabled for
install and enabled for everything else. Skip the initial
Method::Everything resolve in this case, and modify
resolve_with_previous to support running a Method::Required resolve
without a previous resolution.
This also skips adding path overrides, as those won't make sense (and
won't work) for an install directly from a registry.
Introduce a set of tests for "cargo install" directly from a directory
registry.
J. Ryan Stinnett [Mon, 6 Mar 2017 17:40:39 +0000 (11:40 -0600)]
Use time crate directly to get the year